From d17b21da558890c94050188e714265f6c7a46778 Mon Sep 17 00:00:00 2001 From: Mattes D Date: Sun, 20 Nov 2016 18:10:54 +0100 Subject: cWolf: Fixed targetting a nullptr. --- src/Mobs/Wolf.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Mobs/Wolf.cpp b/src/Mobs/Wolf.cpp index e62ec6c30..6751cd7c7 100644 --- a/src/Mobs/Wolf.cpp +++ b/src/Mobs/Wolf.cpp @@ -38,11 +38,12 @@ bool cWolf::DoTakeDamage(TakeDamageInfo & a_TDI) if ((a_TDI.Attacker != nullptr) && a_TDI.Attacker->IsPawn()) { - if (GetTarget()->IsPlayer()) + auto currTarget = GetTarget(); + if ((currTarget != nullptr) && currTarget->IsPlayer()) { if (m_IsTame) { - if ((static_cast(GetTarget())->GetUUID() == m_OwnerUUID)) + if ((static_cast(currTarget)->GetUUID() == m_OwnerUUID)) { SetTarget(PreviousTarget); // Do not attack owner } @@ -64,7 +65,6 @@ bool cWolf::DoTakeDamage(TakeDamageInfo & a_TDI) } } - m_World->BroadcastEntityMetadata(*this); // Broadcast health and possibly angry face return true; } -- cgit v1.2.3